Merge git://git.denx.de/u-boot-cfi-flash
authorTom Rini <[email protected]>
Mon, 4 Dec 2017 15:24:32 +0000 (10:24 -0500)
committerTom Rini <[email protected]>
Mon, 4 Dec 2017 15:24:32 +0000 (10:24 -0500)

Trivial merge